Autogenerated HTML docs for v1.4.4.2-g8336
diff --git a/config.txt b/config.txt index ceac54b..22482d6 100644 --- a/config.txt +++ b/config.txt
@@ -31,6 +31,11 @@ external = "/usr/local/bin/gnu-diff -u" renames = true + [branch "devel"] + remote = origin + merge = refs/heads/devel + + Variables ~~~~~~~~~
diff --git a/git-repo-config.html b/git-repo-config.html index dd411c6..c3bd8ea 100644 --- a/git-repo-config.html +++ b/git-repo-config.html
@@ -588,6 +588,12 @@ external = "/usr/local/bin/gnu-diff -u" renames = true</tt></pre> </div></div> +<div class="literalblock"> +<div class="content"> +<pre><tt>[branch "devel"] + remote = origin + merge = refs/heads/devel</tt></pre> +</div></div> <h3>Variables</h3> <p>Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description @@ -1161,7 +1167,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 16-Dec-2006 07:43:51 UTC +Last updated 19-Dec-2006 00:54:31 UTC </div> </div> </body>
diff --git a/git-show-branch.html b/git-show-branch.html index 631912b..1bc5993 100644 --- a/git-show-branch.html +++ b/git-show-branch.html
@@ -275,7 +275,7 @@ <div class="verseblock"> <div class="content"><em>git-show-branch</em> [--all] [--heads] [--tags] [--topo-order] [--current] [--more=<n> | --list | --independent | --merge-base] - [--no-name | --sha1-name] [<rev> | <glob>]…</div></div> + [--no-name | --sha1-name] [--topics] [<rev> | <glob>]…</div></div> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -408,6 +408,19 @@ object names. </p> </dd> +<dt> +--topics +</dt> +<dd> +<p> + Shows only commits that are NOT on the first branch given. + This helps track topic branches by hiding any commit that + is already in the main line of development. When given + "git show-branch --topics master topic1 topic2", this + will show the revisions given by "git rev-list ^master + topic1 topic2" +</p> +</dd> </dl> <p>Note that --more, --list, --independent and --merge-base options are mutually exclusive.</p> @@ -480,7 +493,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 03-Oct-2006 08:41:28 UTC +Last updated 19-Dec-2006 00:54:32 UTC </div> </div> </body>
diff --git a/git-show-branch.txt b/git-show-branch.txt index a2445a4..948ff10 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt
@@ -10,7 +10,7 @@ [verse] 'git-show-branch' [--all] [--heads] [--tags] [--topo-order] [--current] [--more=<n> | --list | --independent | --merge-base] - [--no-name | --sha1-name] [<rev> | <glob>]... + [--no-name | --sha1-name] [--topics] [<rev> | <glob>]... DESCRIPTION ----------- @@ -86,6 +86,14 @@ of "master"), name them with the unique prefix of their object names. +--topics:: + Shows only commits that are NOT on the first branch given. + This helps track topic branches by hiding any commit that + is already in the main line of development. When given + "git show-branch --topics master topic1 topic2", this + will show the revisions given by "git rev-list {caret}master + topic1 topic2" + Note that --more, --list, --independent and --merge-base options are mutually exclusive. 